Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Cylc VIP to work with named runs. #5314

Merged
merged 4 commits into from
Jan 24, 2023
Merged

Allow Cylc VIP to work with named runs. #5314

merged 4 commits into from
Jan 24, 2023

Conversation

wxtim
Copy link
Member

@wxtim wxtim commented Jan 19, 2023 •
edited
Loading

Closes #5310

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg and conda-environment.yml.
  • Tests are included (or explain why tests are not needed).
  • CHANGES.md entry included if this is a change that can affect users

@wxtim wxtim requested review from datamel and MetRonnie January 19, 2023 20:18
@wxtim wxtim self-assigned this Jan 19, 2023
@wxtim wxtim added this to the 8.1.1 milestone Jan 19, 2023
@wxtim wxtim force-pushed the fix_vip_run_names branch from 7324ca1 to 0f3580b Compare January 19, 2023 20:21
datamel
datamel reviewed Jan 23, 2023
View reviewed changes
Copy link
Contributor

@datamel datamel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the tests need checking on this one.

tests/functional/cylc-combination-scripts/06-vip-named-run.t Show resolved Hide resolved
cylc/flow/workflow_files.py Outdated Show resolved Hide resolved
@wxtim wxtim requested a review from datamel January 23, 2023 15:00
@oliver-sanders
Copy link
Member 

$ cylc install generic --run-name foo
INSTALLED generic/foo from ~/cylc-src/generic

$ cylc vip generic --run-name bar
$ cylc validate ~/cylc-src/generic
Valid for cylc-8.1.0
$ cylc install ~/cylc-src/generic
INSTALLED generic/bar from ~/cylc-src/generic
$ cylc play generic

 ▪ ■  Cylc Workflow Engine 8.1.0
 ██   Copyright (C) 2008-2023 NIWA
▝▘    & British Crown (Met Office) & Contributors

WorkflowFilesError: No flow.cylc or suite.rc in ~/cylc-run/generic

@oliver-sanders
Copy link
Member

Could you rebase onto 8.1.x please.

@wxtim wxtim changed the base branch from master to 8.1.x January 24, 2023 09:55
@wxtim wxtim force-pushed the fix_vip_run_names branch from 275d441 to ae68884 Compare January 24, 2023 10:00
@wxtim
Copy link
Member Author

wxtim commented Jan 24, 2023 

$ cylc install generic --run-name foo
INSTALLED generic/foo from ~/cylc-src/generic

$ cylc vip generic --run-name bar
$ cylc validate ~/cylc-src/generic
Valid for cylc-8.1.0
$ cylc install ~/cylc-src/generic
INSTALLED generic/bar from ~/cylc-src/generic
$ cylc play generic

 ▪ ■  Cylc Workflow Engine 8.1.0
 ██   Copyright (C) 2008-2023 NIWA
▝▘    & British Crown (Met Office) & Contributors

WorkflowFilesError: No flow.cylc or suite.rc in ~/cylc-run/generic

I haven't been able to replicate this.

@wxtim
Get both workflow name and workflow id from install:
949e38a 
Where name is `workflow` and id is `workflow/runX` or `workflow/name`.

mypy fix
@wxtim wxtim force-pushed the fix_vip_run_names branch from ae68884 to 949e38a Compare January 24, 2023 10:14
MetRonnie
MetRonnie reviewed Jan 24, 2023
View reviewed changes
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot reproduce Oliver's "No flow.cylc or suite.rc in ~/cylc-run/generic"

tests/functional/cylc-combination-scripts/06-vip-named-run Show resolved Hide resolved
cylc/flow/workflow_files.py Show resolved Hide resolved
CHANGES.md Show resolved Hide resolved
@wxtim wxtim force-pushed the fix_vip_run_names branch from 935c3bd to a8ef493 Compare January 24, 2023 11:01
@wxtim wxtim requested a review from MetRonnie January 24, 2023 11:01
MetRonnie
MetRonnie approved these changes Jan 24, 2023
View reviewed changes
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this need a cylc-rose PR?

@wxtim
Copy link
Member Author

wxtim commented Jan 24, 2023

Will this need a cylc-rose PR?

I don't think cylc-run uses the changed interfaces, and running the tests suggests that it doesn't.

@oliver-sanders oliver-sanders removed the request for review from datamel January 24, 2023 17:24
@oliver-sanders oliver-sanders merged commit eb60339 into cylc:8.1.x Jan 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@datamel datamel datamel left review comments

@MetRonnie MetRonnie MetRonnie approved these changes

@oliver-sanders oliver-sanders oliver-sanders approved these changes

Assignees

@wxtim wxtim

Labels
None yet
Projects
None yet
Milestone
8.1.1
Development

Successfully merging this pull request may close these issues.

VIP: Run Name not handled
4 participants
@wxtim @oliver-sanders @datamel @MetRonnie